Add libcloudproviders as a fallback subproject

We require a new version of libcloudproviders so that we can enable it
in our CI pipeline.

diff --git a/meson.build b/meson.build
index 9d9e4e37b2319b11b83ff13127ce6da334673509..3453551c366a78de74521185e87a49995db4a955 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,7 @@ wayland_proto_req  = '>= 1.20'
 wayland_req        = '>= 1.14.91'
 graphene_req       = '>= 1.9.1'
 epoxy_req          = '>= 1.4'
-cloudproviders_req = '>= 0.2.5'
+cloudproviders_req = '>= 0.3.1'
 xkbcommon_req      = '>= 0.2.0'
 
 gnome = import('gnome')
@@ -666,7 +666,15 @@ endif
 
 cloudproviders_enabled = get_option('cloudproviders')
 if cloudproviders_enabled
-  cloudproviders_dep = dependency('cloudproviders', required: true)
+  cloudproviders_dep = dependency('cloudproviders',
+    version: cloudproviders_req,
+    fallback: [
+      'libcloudproviders',
+      'libcloudproviders_dep',
+    ],
+    default_options: [
+      'vapigen=false',
+    ])
   if cloudproviders_dep.found()
     cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found())
   else

diff --git a/subprojects/libcloudproviders.wrap b/subprojects/libcloudproviders.wrap
new file mode 100644 (file)
index 0000000..2b47d8c
--- /dev/null
+++ b/subprojects/libcloudproviders.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libcloudproviders
+url=https://gitlab.gnome.org/World/libcloudproviders.git
+revision=master